merge with xen-unstable.hg
authorIsaku Yamahata <yamahata@valinux.co.jp>
Tue, 10 Mar 2009 02:00:34 +0000 (11:00 +0900)
committerIsaku Yamahata <yamahata@valinux.co.jp>
Tue, 10 Mar 2009 02:00:34 +0000 (11:00 +0900)

Trivial merge